Skip to content

Commit

Permalink
Auto merge of rust-lang#28249 - stepancheg:get-num-cpus, r=huonw
Browse files Browse the repository at this point in the history
No need to export this symbol. `rust_get_num_cpus` is exported.
  • Loading branch information
bors committed Sep 5, 2015
2 parents 5c2cfdf + 6ca5d52 commit 205c356
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/rt/rust_builtin.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rust_dirent_t_size() {
}

#if defined(__BSD__)
int
static int
get_num_cpus() {
/* swiped from http://stackoverflow.com/questions/150355/
programmatically-find-the-number-of-cores-on-a-machine */
Expand All @@ -110,7 +110,7 @@ get_num_cpus() {
return numCPU;
}
#elif defined(__GNUC__)
int
static int
get_num_cpus() {
return sysconf(_SC_NPROCESSORS_ONLN);
}
Expand Down

0 comments on commit 205c356

Please sign in to comment.